Merge git://git.denx.de/u-boot-usb
authorTom Rini <[email protected]>
Sun, 28 Jan 2018 14:21:53 +0000 (09:21 -0500)
committerTom Rini <[email protected]>
Sun, 28 Jan 2018 14:21:53 +0000 (09:21 -0500)

Trivial merge